finalized merge with openOOD
